mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

genesys: Simplify register definitions on gl847

merge-requests/213/head
Povilas Kanapickas 2019-12-08 11:42:20 +02:00
rodzic 06742ab7d4
commit cb64243e5d
2 zmienionych plików z 28 dodań i 64 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

60
backend/genesys/gl847.cpp
Wyświetl plik

@ -78,12 +78,8 @@ static void gl847_setup_sensor(Genesys_Device * dev, const Genesys_Sensor& senso
DBG_HELPER(dbg); DBG_HELPER(dbg);
uint16_t exp; uint16_t exp;
for (uint16_t addr = 0x16; addr < 0x1e; addr++) { for (const auto& reg : sensor.custom_regs) {
regs->set8(addr, sensor.custom_regs.get_value(addr)); regs->set8(reg.address, reg.value);
}
for (uint16_t addr = 0x52; addr < 0x52 + 9; addr++) {
regs->set8(addr, sensor.custom_regs.get_value(addr));
} }
for (const auto& reg : sensor_profile.custom_regs) { for (const auto& reg : sensor_profile.custom_regs) {
@ -154,17 +150,17 @@ gl847_init_registers (Genesys_Device * dev)
dev->reg.init_reg(0x14, 0x00); dev->reg.init_reg(0x14, 0x00);
dev->reg.init_reg(0x15, 0x00); dev->reg.init_reg(0x15, 0x00);
dev->reg.init_reg(0x16, 0x10); dev->reg.init_reg(0x16, 0x10); // SENSOR_DEF
dev->reg.init_reg(0x17, 0x08); dev->reg.init_reg(0x17, 0x08); // SENSOR_DEF
dev->reg.init_reg(0x18, 0x00); dev->reg.init_reg(0x18, 0x00); // SENSOR_DEF
// EXPDMY // EXPDMY
dev->reg.init_reg(0x19, 0x50); dev->reg.init_reg(0x19, 0x50); // SENSOR_DEF
dev->reg.init_reg(0x1a, 0x34); dev->reg.init_reg(0x1a, 0x34); // SENSOR_DEF
dev->reg.init_reg(0x1b, 0x00); dev->reg.init_reg(0x1b, 0x00); // SENSOR_DEF
dev->reg.init_reg(0x1c, 0x02); dev->reg.init_reg(0x1c, 0x02); // SENSOR_DEF
dev->reg.init_reg(0x1d, 0x04); dev->reg.init_reg(0x1d, 0x04); // SENSOR_DEF
dev->reg.init_reg(0x1e, 0x10); dev->reg.init_reg(0x1e, 0x10);
dev->reg.init_reg(0x1f, 0x04); dev->reg.init_reg(0x1f, 0x04);
dev->reg.init_reg(0x20, 0x02); dev->reg.init_reg(0x20, 0x02);
@ -192,15 +188,15 @@ gl847_init_registers (Genesys_Device * dev)
dev->reg.init_reg(0x3d, 0x00); dev->reg.init_reg(0x3d, 0x00);
dev->reg.init_reg(0x3e, 0x00); dev->reg.init_reg(0x3e, 0x00);
dev->reg.init_reg(0x3f, 0x00); dev->reg.init_reg(0x3f, 0x00);
dev->reg.init_reg(0x52, 0x03); dev->reg.init_reg(0x52, 0x03); // SENSOR_DEF
dev->reg.init_reg(0x53, 0x07); dev->reg.init_reg(0x53, 0x07); // SENSOR_DEF
dev->reg.init_reg(0x54, 0x00); dev->reg.init_reg(0x54, 0x00); // SENSOR_DEF
dev->reg.init_reg(0x55, 0x00); dev->reg.init_reg(0x55, 0x00); // SENSOR_DEF
dev->reg.init_reg(0x56, 0x00); dev->reg.init_reg(0x56, 0x00); // SENSOR_DEF
dev->reg.init_reg(0x57, 0x00); dev->reg.init_reg(0x57, 0x00); // SENSOR_DEF
dev->reg.init_reg(0x58, 0x2a); dev->reg.init_reg(0x58, 0x2a); // SENSOR_DEF
dev->reg.init_reg(0x59, 0xe1); dev->reg.init_reg(0x59, 0xe1); // SENSOR_DEF
dev->reg.init_reg(0x5a, 0x55); dev->reg.init_reg(0x5a, 0x55); // SENSOR_DEF
dev->reg.init_reg(0x5e, 0x41); dev->reg.init_reg(0x5e, 0x41);
dev->reg.init_reg(0x5f, 0x40); dev->reg.init_reg(0x5f, 0x40);
dev->reg.init_reg(0x60, 0x00); dev->reg.init_reg(0x60, 0x00);
@ -215,19 +211,19 @@ gl847_init_registers (Genesys_Device * dev)
dev->reg.init_reg(0x6a, 0x20); dev->reg.init_reg(0x6a, 0x20);
// CK1MAP // CK1MAP
dev->reg.init_reg(0x74, 0x00); dev->reg.init_reg(0x74, 0x00); // SENSOR_DEF
dev->reg.init_reg(0x75, 0x00); dev->reg.init_reg(0x75, 0x00); // SENSOR_DEF
dev->reg.init_reg(0x76, 0x3c); dev->reg.init_reg(0x76, 0x3c); // SENSOR_DEF
// CK3MAP // CK3MAP
dev->reg.init_reg(0x77, 0x00); dev->reg.init_reg(0x77, 0x00); // SENSOR_DEF
dev->reg.init_reg(0x78, 0x00); dev->reg.init_reg(0x78, 0x00); // SENSOR_DEF
dev->reg.init_reg(0x79, 0x9f); dev->reg.init_reg(0x79, 0x9f); // SENSOR_DEF
// CK4MAP // CK4MAP
dev->reg.init_reg(0x7a, 0x00); dev->reg.init_reg(0x7a, 0x00); // SENSOR_DEF
dev->reg.init_reg(0x7b, 0x00); dev->reg.init_reg(0x7b, 0x00); // SENSOR_DEF
dev->reg.init_reg(0x7c, 0x55); dev->reg.init_reg(0x7c, 0x55); // SENSOR_DEF
dev->reg.init_reg(0x7d, 0x00); dev->reg.init_reg(0x7d, 0x00);

32
backend/genesys/tables_sensor.cpp
Wyświetl plik

@ -1602,10 +1602,6 @@ void genesys_init_sensor_tables()
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
sensor.custom_regs = { sensor.custom_regs = {
{ 0x08, 0x00 },
{ 0x09, 0x00 },
{ 0x0a, 0x00 },
{ 0x0b, 0x00 },
{ 0x16, 0x10 }, { 0x16, 0x10 },
{ 0x17, 0x08 }, { 0x17, 0x08 },
{ 0x18, 0x00 }, { 0x18, 0x00 },
@ -1623,10 +1619,6 @@ void genesys_init_sensor_tables()
{ 0x58, 0x2a }, { 0x58, 0x2a },
{ 0x59, 0xe1 }, { 0x59, 0xe1 },
{ 0x5a, 0x55 }, { 0x5a, 0x55 },
{ 0x5b, 0x00 },
{ 0x5c, 0x00 },
{ 0x5d, 0x00 },
{ 0x5e, 0x41 },
}; };
sensor.gamma = { 2.2f, 2.2f, 2.2f }; sensor.gamma = { 2.2f, 2.2f, 2.2f };
sensor.get_logical_hwdpi_fun = default_get_logical_hwdpi; sensor.get_logical_hwdpi_fun = default_get_logical_hwdpi;
@ -1740,10 +1732,6 @@ void genesys_init_sensor_tables()
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
sensor.custom_regs = { sensor.custom_regs = {
{ 0x08, 0x00 },
{ 0x09, 0x00 },
{ 0x0a, 0x00 },
{ 0x0b, 0x00 },
{ 0x16, 0x10 }, { 0x16, 0x10 },
{ 0x17, 0x08 }, { 0x17, 0x08 },
{ 0x18, 0x00 }, { 0x18, 0x00 },
@ -1761,10 +1749,6 @@ void genesys_init_sensor_tables()
{ 0x58, 0x2a }, { 0x58, 0x2a },
{ 0x59, 0xe1 }, { 0x59, 0xe1 },
{ 0x5a, 0x55 }, { 0x5a, 0x55 },
{ 0x5b, 0x00 },
{ 0x5c, 0x00 },
{ 0x5d, 0x00 },
{ 0x5e, 0x41 },
}; };
sensor.gamma = { 1.0f, 1.0f, 1.0f }; sensor.gamma = { 1.0f, 1.0f, 1.0f };
sensor.get_logical_hwdpi_fun = default_get_logical_hwdpi; sensor.get_logical_hwdpi_fun = default_get_logical_hwdpi;
@ -1876,10 +1860,6 @@ void genesys_init_sensor_tables()
sensor.gain_white_ref = 200; sensor.gain_white_ref = 200;
sensor.exposure = { 0x01c1, 0x0126, 0x00e5 }; sensor.exposure = { 0x01c1, 0x0126, 0x00e5 };
sensor.custom_regs = { sensor.custom_regs = {
{ 0x08, 0x00 },
{ 0x09, 0x00 },
{ 0x0a, 0x00 },
{ 0x0b, 0x00 },
{ 0x16, 0x10 }, { 0x16, 0x10 },
{ 0x17, 0x08 }, { 0x17, 0x08 },
{ 0x18, 0x00 }, { 0x18, 0x00 },
@ -1897,10 +1877,6 @@ void genesys_init_sensor_tables()
{ 0x58, 0x2a }, { 0x58, 0x2a },
{ 0x59, 0xe1 }, { 0x59, 0xe1 },
{ 0x5a, 0x55 }, { 0x5a, 0x55 },
{ 0x5b, 0x00 },
{ 0x5c, 0x00 },
{ 0x5d, 0x00 },
{ 0x5e, 0x41 },
}; };
sensor.gamma = { 2.2f, 2.2f, 2.2f }; sensor.gamma = { 2.2f, 2.2f, 2.2f };
sensor.get_logical_hwdpi_fun = default_get_logical_hwdpi; sensor.get_logical_hwdpi_fun = default_get_logical_hwdpi;
@ -2836,10 +2812,6 @@ void genesys_init_sensor_tables()
sensor.gain_white_ref = 230; sensor.gain_white_ref = 230;
sensor.exposure = { 0x0000, 0x0000, 0x0000 }; sensor.exposure = { 0x0000, 0x0000, 0x0000 };
sensor.custom_regs = { sensor.custom_regs = {
{ 0x08, 0x00 },
{ 0x09, 0x10 },
{ 0x0a, 0x10 },
{ 0x0b, 0x0c },
{ 0x16, 0x33 }, { 0x16, 0x33 },
{ 0x17, 0x0c }, { 0x17, 0x0c },
{ 0x18, 0x02 }, { 0x18, 0x02 },
@ -2857,10 +2829,6 @@ void genesys_init_sensor_tables()
{ 0x58, 0x63 }, { 0x58, 0x63 },
{ 0x59, 0x00 }, { 0x59, 0x00 },
{ 0x5a, 0x40 }, { 0x5a, 0x40 },
{ 0x5b, 0x00 },
{ 0x5c, 0x00 },
{ 0x5d, 0x06 },
{ 0x5e, 0x6f },
}; };
sensor.gamma = { 1.0f, 1.0f, 1.0f }; sensor.gamma = { 1.0f, 1.0f, 1.0f };
sensor.get_logical_hwdpi_fun = default_get_logical_hwdpi; sensor.get_logical_hwdpi_fun = default_get_logical_hwdpi;