Organize into arch, board, and ec modules

This commit is contained in:
Jeremy Soller
2019-09-29 20:13:03 -06:00
parent 9d056547e6
commit ded5181926
47 changed files with 518 additions and 486 deletions

17
src/ec/it8587e/gpio.c Normal file
View File

@ -0,0 +1,17 @@
#include <ec/gpio.h>
bool gpio_get(struct Gpio * gpio) {
if (*(gpio->data) & gpio->value) {
return true;
} else {
return false;
}
}
void gpio_set(struct Gpio * gpio, bool value) {
if (value) {
*(gpio->data) |= gpio->value;
} else {
*(gpio->data) &= ~(gpio->value);
}
}

View File

@ -0,0 +1,10 @@
#ifndef _EC_GCTRL_H
#define _EC_GCTRL_H
#include <stdint.h>
__xdata volatile uint8_t __at(0x2006) RSTS;
__xdata volatile uint8_t __at(0x200A) BADRSEL;
__xdata volatile uint8_t __at(0x200D) SPCTRL1;
#endif // _EC_GCTRL_H

View File

@ -0,0 +1,160 @@
#ifndef _EC_GPIO_H
#define _EC_GPIO_H
#include <stdbool.h>
#include <stdint.h>
struct Gpio {
__xdata volatile uint8_t * data;
__xdata volatile uint8_t * mirror;
__xdata volatile uint8_t * control;
uint8_t value;
};
#define GPIO(BLOCK, NUMBER) { \
.data = &GPDR ## BLOCK, \
.mirror = &GPDMR ## BLOCK, \
.control = &GPCR ## BLOCK ## NUMBER, \
.value = (1 << NUMBER), \
}
bool gpio_get(struct Gpio * gpio);
void gpio_set(struct Gpio * gpio, bool value);
__xdata volatile uint8_t __at(0x1600) GCR;
__xdata volatile uint8_t __at(0x1601) GPDRA;
__xdata volatile uint8_t __at(0x1602) GPDRB;
__xdata volatile uint8_t __at(0x1603) GPDRC;
__xdata volatile uint8_t __at(0x1604) GPDRD;
__xdata volatile uint8_t __at(0x1605) GPDRE;
__xdata volatile uint8_t __at(0x1606) GPDRF;
__xdata volatile uint8_t __at(0x1607) GPDRG;
__xdata volatile uint8_t __at(0x1608) GPDRH;
__xdata volatile uint8_t __at(0x1609) GPDRI;
__xdata volatile uint8_t __at(0x160A) GPDRJ;
__xdata volatile uint8_t __at(0x160D) GPDRM;
__xdata volatile uint8_t __at(0x1661) GPDMRA;
__xdata volatile uint8_t __at(0x1662) GPDMRB;
__xdata volatile uint8_t __at(0x1663) GPDMRC;
__xdata volatile uint8_t __at(0x1664) GPDMRD;
__xdata volatile uint8_t __at(0x1665) GPDMRE;
__xdata volatile uint8_t __at(0x1666) GPDMRF;
__xdata volatile uint8_t __at(0x1667) GPDMRG;
__xdata volatile uint8_t __at(0x1668) GPDMRH;
__xdata volatile uint8_t __at(0x1669) GPDMRI;
__xdata volatile uint8_t __at(0x166A) GPDMRJ;
__xdata volatile uint8_t __at(0x166D) GPDMRM;
__xdata volatile uint8_t __at(0x1671) GPOTA;
__xdata volatile uint8_t __at(0x1672) GPOTB;
__xdata volatile uint8_t __at(0x1673) GPOTC;
__xdata volatile uint8_t __at(0x1674) GPOTD;
__xdata volatile uint8_t __at(0x1675) GPOTE;
__xdata volatile uint8_t __at(0x1676) GPOTF;
__xdata volatile uint8_t __at(0x1677) GPOTG;
__xdata volatile uint8_t __at(0x1678) GPOTH;
__xdata volatile uint8_t __at(0x1679) GPOTI;
__xdata volatile uint8_t __at(0x167A) GPOTJ;
// GPOTM does not exist
__xdata volatile uint8_t __at(0x1610) GPCRA0;
__xdata volatile uint8_t __at(0x1611) GPCRA1;
__xdata volatile uint8_t __at(0x1612) GPCRA2;
__xdata volatile uint8_t __at(0x1613) GPCRA3;
__xdata volatile uint8_t __at(0x1614) GPCRA4;
__xdata volatile uint8_t __at(0x1615) GPCRA5;
__xdata volatile uint8_t __at(0x1616) GPCRA6;
__xdata volatile uint8_t __at(0x1617) GPCRA7;
__xdata volatile uint8_t __at(0x1618) GPCRB0;
__xdata volatile uint8_t __at(0x1619) GPCRB1;
__xdata volatile uint8_t __at(0x161A) GPCRB2;
__xdata volatile uint8_t __at(0x161B) GPCRB3;
__xdata volatile uint8_t __at(0x161C) GPCRB4;
__xdata volatile uint8_t __at(0x161D) GPCRB5;
__xdata volatile uint8_t __at(0x161E) GPCRB6;
__xdata volatile uint8_t __at(0x161F) GPCRB7;
__xdata volatile uint8_t __at(0x1620) GPCRC0;
__xdata volatile uint8_t __at(0x1621) GPCRC1;
__xdata volatile uint8_t __at(0x1622) GPCRC2;
__xdata volatile uint8_t __at(0x1623) GPCRC3;
__xdata volatile uint8_t __at(0x1624) GPCRC4;
__xdata volatile uint8_t __at(0x1625) GPCRC5;
__xdata volatile uint8_t __at(0x1626) GPCRC6;
__xdata volatile uint8_t __at(0x1627) GPCRC7;
__xdata volatile uint8_t __at(0x1628) GPCRD0;
__xdata volatile uint8_t __at(0x1629) GPCRD1;
__xdata volatile uint8_t __at(0x162A) GPCRD2;
__xdata volatile uint8_t __at(0x162B) GPCRD3;
__xdata volatile uint8_t __at(0x162C) GPCRD4;
__xdata volatile uint8_t __at(0x162D) GPCRD5;
__xdata volatile uint8_t __at(0x162E) GPCRD6;
__xdata volatile uint8_t __at(0x162F) GPCRD7;
__xdata volatile uint8_t __at(0x1630) GPCRE0;
__xdata volatile uint8_t __at(0x1631) GPCRE1;
__xdata volatile uint8_t __at(0x1632) GPCRE2;
__xdata volatile uint8_t __at(0x1633) GPCRE3;
__xdata volatile uint8_t __at(0x1634) GPCRE4;
__xdata volatile uint8_t __at(0x1635) GPCRE5;
__xdata volatile uint8_t __at(0x1636) GPCRE6;
__xdata volatile uint8_t __at(0x1637) GPCRE7;
__xdata volatile uint8_t __at(0x1638) GPCRF0;
__xdata volatile uint8_t __at(0x1639) GPCRF1;
__xdata volatile uint8_t __at(0x163A) GPCRF2;
__xdata volatile uint8_t __at(0x163B) GPCRF3;
__xdata volatile uint8_t __at(0x163C) GPCRF4;
__xdata volatile uint8_t __at(0x163D) GPCRF5;
__xdata volatile uint8_t __at(0x163E) GPCRF6;
__xdata volatile uint8_t __at(0x163F) GPCRF7;
__xdata volatile uint8_t __at(0x1640) GPCRG0;
__xdata volatile uint8_t __at(0x1641) GPCRG1;
__xdata volatile uint8_t __at(0x1642) GPCRG2;
__xdata volatile uint8_t __at(0x1643) GPCRG3;
__xdata volatile uint8_t __at(0x1644) GPCRG4;
__xdata volatile uint8_t __at(0x1645) GPCRG5;
__xdata volatile uint8_t __at(0x1646) GPCRG6;
__xdata volatile uint8_t __at(0x1647) GPCRG7;
__xdata volatile uint8_t __at(0x1648) GPCRH0;
__xdata volatile uint8_t __at(0x1649) GPCRH1;
__xdata volatile uint8_t __at(0x164A) GPCRH2;
__xdata volatile uint8_t __at(0x164B) GPCRH3;
__xdata volatile uint8_t __at(0x164C) GPCRH4;
__xdata volatile uint8_t __at(0x164D) GPCRH5;
__xdata volatile uint8_t __at(0x164E) GPCRH6;
__xdata volatile uint8_t __at(0x164F) GPCRH7;
__xdata volatile uint8_t __at(0x1650) GPCRI0;
__xdata volatile uint8_t __at(0x1651) GPCRI1;
__xdata volatile uint8_t __at(0x1652) GPCRI2;
__xdata volatile uint8_t __at(0x1653) GPCRI3;
__xdata volatile uint8_t __at(0x1654) GPCRI4;
__xdata volatile uint8_t __at(0x1655) GPCRI5;
__xdata volatile uint8_t __at(0x1656) GPCRI6;
__xdata volatile uint8_t __at(0x1657) GPCRI7;
__xdata volatile uint8_t __at(0x1658) GPCRJ0;
__xdata volatile uint8_t __at(0x1659) GPCRJ1;
__xdata volatile uint8_t __at(0x165A) GPCRJ2;
__xdata volatile uint8_t __at(0x165B) GPCRJ3;
__xdata volatile uint8_t __at(0x165C) GPCRJ4;
__xdata volatile uint8_t __at(0x165D) GPCRJ5;
__xdata volatile uint8_t __at(0x165E) GPCRJ6;
__xdata volatile uint8_t __at(0x165F) GPCRJ7;
__xdata volatile uint8_t __at(0x16A0) GPCRM0;
__xdata volatile uint8_t __at(0x16A1) GPCRM1;
__xdata volatile uint8_t __at(0x16A2) GPCRM2;
__xdata volatile uint8_t __at(0x16A3) GPCRM3;
__xdata volatile uint8_t __at(0x16A4) GPCRM4;
__xdata volatile uint8_t __at(0x16A5) GPCRM5;
__xdata volatile uint8_t __at(0x16A6) GPCRM6;
#endif // _EC_GPIO_H

View File

@ -0,0 +1,43 @@
#ifndef _EC_KBC_H
#define _EC_KBC_H
#include <stdint.h>
void kbc_init(void);
struct Kbc {
// Control register
volatile uint8_t * control;
// Interrupt control register
volatile uint8_t * irq;
// Status register
volatile uint8_t * status;
// Keyboard out register
volatile uint8_t * keyboard_out;
// Mouse out register
volatile uint8_t * mouse_out;
// Data in register
volatile uint8_t * data_in;
};
extern __code struct Kbc KBC;
#define KBC_STS_OBF (1 << 0)
#define KBC_STS_IBF (1 << 1)
#define KBC_STS_CMD (1 << 3)
uint8_t kbc_status(struct Kbc * kbc);
uint8_t kbc_read(struct Kbc * kbc);
void kbc_keyboard(struct Kbc * kbc, uint8_t data);
void kbc_mouse(struct Kbc * kbc, uint8_t data);
void kbc_event(struct Kbc * kbc);
__xdata volatile uint8_t __at(0x1300) KBHICR;
__xdata volatile uint8_t __at(0x1302) KBIRQR;
__xdata volatile uint8_t __at(0x1304) KBHISR;
__xdata volatile uint8_t __at(0x1306) KBHIKDOR;
__xdata volatile uint8_t __at(0x1308) KBHIMDOR;
__xdata volatile uint8_t __at(0x130A) KBHIDIR;
#endif // _EC_KBC_H

View File

@ -0,0 +1,47 @@
#ifndef _EC_KBSCAN_H
#define _EC_KBSCAN_H
#include <stdint.h>
__xdata volatile uint8_t __at(0x1D00) KSOL;
__xdata volatile uint8_t __at(0x1D01) KSOH1;
__xdata volatile uint8_t __at(0x1D02) KSOCTRL;
__xdata volatile uint8_t __at(0x1D03) KSOH2;
__xdata volatile uint8_t __at(0x1D04) KSI;
__xdata volatile uint8_t __at(0x1D05) KSICTRLR;
__xdata volatile uint8_t __at(0x1D06) KSIGCTRL;
__xdata volatile uint8_t __at(0x1D07) KSIGOEN;
__xdata volatile uint8_t __at(0x1D08) KSIGDAT;
__xdata volatile uint8_t __at(0x1D09) KSIGDMRR;
__xdata volatile uint8_t __at(0x1D0A) KSOHGCTRL;
__xdata volatile uint8_t __at(0x1D0B) KSOHGOEN;
__xdata volatile uint8_t __at(0x1D0C) KSOHGDMRR;
__xdata volatile uint8_t __at(0x1D0D) KSOLGCTRL;
__xdata volatile uint8_t __at(0x1D0E) KSOLGOEN;
__xdata volatile uint8_t __at(0x1D0F) KSOLGDMRR;
__xdata volatile uint8_t __at(0x1D10) KSO0LSDR;
__xdata volatile uint8_t __at(0x1D11) KSO1LSDR;
__xdata volatile uint8_t __at(0x1D12) KSO2LSDR;
__xdata volatile uint8_t __at(0x1D13) KSO3LSDR;
__xdata volatile uint8_t __at(0x1D14) KSO4LSDR;
__xdata volatile uint8_t __at(0x1D15) KSO5LSDR;
__xdata volatile uint8_t __at(0x1D16) KSO6LSDR;
__xdata volatile uint8_t __at(0x1D17) KSO7LSDR;
__xdata volatile uint8_t __at(0x1D18) KSO8LSDR;
__xdata volatile uint8_t __at(0x1D19) KSO9LSDR;
__xdata volatile uint8_t __at(0x1D1A) KSO10LSDR;
__xdata volatile uint8_t __at(0x1D1B) KSO11LSDR;
__xdata volatile uint8_t __at(0x1D1C) KSO12LSDR;
__xdata volatile uint8_t __at(0x1D1D) KSO13LSDR;
__xdata volatile uint8_t __at(0x1D1E) KSO14LSDR;
__xdata volatile uint8_t __at(0x1D1F) KSO15LSDR;
__xdata volatile uint8_t __at(0x1D20) KSO16LSDR;
__xdata volatile uint8_t __at(0x1D21) KSO17LSDR;
__xdata volatile uint8_t __at(0x1D22) SDC1R;
__xdata volatile uint8_t __at(0x1D23) SDC2R;
__xdata volatile uint8_t __at(0x1D24) SDC3R;
__xdata volatile uint8_t __at(0x1D25) SDSR;
#endif // _EC_KBSCAN_H

View File

@ -0,0 +1,40 @@
#ifndef _EC_PMC_H
#define _EC_PMC_H
#include <stdint.h>
struct Pmc {
// Status register
volatile uint8_t * status;
// Data out register
volatile uint8_t * data_out;
// Data in register
volatile uint8_t * data_in;
// Control register
volatile uint8_t * control;
};
extern __code struct Pmc PMC_1;
extern __code struct Pmc PMC_2;
#define PMC_STS_OBF (1 << 0)
#define PMC_STS_IBF (1 << 1)
#define PMC_STS_CMD (1 << 3)
uint8_t pmc_status(struct Pmc * pmc);
uint8_t pmc_read(struct Pmc * pmc);
void pmc_write(struct Pmc * pmc, uint8_t data);
void pmc_event(struct Pmc * pmc);
__xdata volatile uint8_t __at(0x1500) PM1STS;
__xdata volatile uint8_t __at(0x1501) PM1DO;
__xdata volatile uint8_t __at(0x1504) PM1DI;
__xdata volatile uint8_t __at(0x1506) PM1CTL;
__xdata volatile uint8_t __at(0x1510) PM2STS;
__xdata volatile uint8_t __at(0x1511) PM2DO;
__xdata volatile uint8_t __at(0x1514) PM2DI;
__xdata volatile uint8_t __at(0x1516) PM2CTL;
#endif // _EC_PMC_H

View File

@ -0,0 +1,22 @@
#ifndef _EC_PS2_H
#define _EC_PS2_H
#include <stdint.h>
__xdata volatile uint8_t __at(0x1700) PSCTL1;
__xdata volatile uint8_t __at(0x1701) PSCTL2;
__xdata volatile uint8_t __at(0x1702) PSCTL3;
__xdata volatile uint8_t __at(0x1704) PSINT1;
__xdata volatile uint8_t __at(0x1705) PSINT2;
__xdata volatile uint8_t __at(0x1706) PSINT3;
__xdata volatile uint8_t __at(0x1708) PSSTS1;
__xdata volatile uint8_t __at(0x1709) PSSTS2;
__xdata volatile uint8_t __at(0x170A) PSSTS3;
__xdata volatile uint8_t __at(0x170C) PSDAT1;
__xdata volatile uint8_t __at(0x170D) PSDAT2;
__xdata volatile uint8_t __at(0x170E) PSDAT3;
#endif // _EC_PS2_H

40
src/ec/it8587e/kbc.c Normal file
View File

@ -0,0 +1,40 @@
#include <stdio.h>
#include <ec/kbc.h>
__code struct Kbc KBC = {
.control = &KBHICR,
.irq = &KBIRQR,
.status = &KBHISR,
.keyboard_out = &KBHIKDOR,
.mouse_out = &KBHIMDOR,
.data_in = &KBHIDIR,
};
uint8_t kbc_status(struct Kbc * kbc) {
return *(kbc->status);
}
uint8_t kbc_read(struct Kbc * kbc) {
return *(kbc->data_in);
}
void kbc_keyboard(struct Kbc * kbc, uint8_t data) {
*(kbc->keyboard_out) = data;
}
void kbc_mouse(struct Kbc * kbc, uint8_t data) {
*(kbc->mouse_out) = data;
}
void kbc_event(struct Kbc * kbc) {
uint8_t sts = kbc_status(kbc);
if (sts & KBC_STS_IBF) {
uint8_t data = kbc_read(kbc);
if (sts & KBC_STS_CMD) {
printf("kbc cmd: %02X\n", data);
} else {
printf("kbc data: %02X\n", data);
}
}
}

79
src/ec/it8587e/pmc.c Normal file
View File

@ -0,0 +1,79 @@
#include <stdio.h>
#include <board/acpi.h>
#include <ec/pmc.h>
#define PMC(NUM) { \
.status = &PM ## NUM ## STS, \
.data_out = &PM ## NUM ## DO, \
.data_in = &PM ## NUM ## DI, \
.control = &PM ## NUM ## CTL, \
}
__code struct Pmc PMC_1 = PMC(1);
__code struct Pmc PMC_2 = PMC(2);
uint8_t pmc_status(struct Pmc * pmc) {
return *(pmc->status);
}
uint8_t pmc_read(struct Pmc * pmc) {
return *(pmc->data_in);
}
void pmc_write(struct Pmc * pmc, uint8_t data) {
*(pmc->data_out) = data;
}
enum PmcState {
PMC_STATE_DEFAULT,
PMC_STATE_ACPI_READ,
PMC_STATE_ACPI_WRITE,
PMC_STATE_ACPI_WRITE_ADDR,
};
void pmc_event(struct Pmc * pmc) {
static enum PmcState state = PMC_STATE_DEFAULT;
static uint8_t state_data[2] = {0, 0};
uint8_t sts = pmc_status(pmc);
if (sts & PMC_STS_IBF) {
uint8_t data = pmc_read(pmc);
if (sts & PMC_STS_CMD) {
printf("pmc cmd: %02X\n", data);
switch (data) {
case 0x80:
state = PMC_STATE_ACPI_READ;
break;
case 0x81:
state = PMC_STATE_ACPI_WRITE;
break;
default:
state = PMC_STATE_DEFAULT;
break;
}
} else {
printf("pmc data: %02X\n", data);
switch (state) {
case PMC_STATE_ACPI_READ:
state = PMC_STATE_DEFAULT;
uint8_t value = acpi_read(data);
pmc_write(pmc, value);
break;
case PMC_STATE_ACPI_WRITE:
state = PMC_STATE_ACPI_WRITE_ADDR;
state_data[0] = data;
break;
case PMC_STATE_ACPI_WRITE_ADDR:
state = PMC_STATE_DEFAULT;
acpi_write(state_data[0], data);
break;
default:
state = PMC_STATE_DEFAULT;
break;
}
}
}
}

View File

@ -0,0 +1,7 @@
static __code char __at(0x40) SIGNATURE[32] = {
0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0xA5, 0x94,
0x85, 0x12, 0x5A, 0x5A, 0xAA, 0x00, 0x55, 0x55,
0x49, 0x54, 0x45, 0x20, 0x54, 0x65, 0x63, 0x68,
0x2E, 0x20, 0x49, 0x6E, 0x63, 0x2E, 0x20, 0x20
};