View | Details | Raw Unified | Return to bug 119206
Collapse All | Expand All

(-)linux-2.6.13/drivers/acpi/asus_acpi.c (-2 / +18 lines)
Lines 135-140 struct asus_hotk { Link Here
135
		L3H,      //L3H, but also L2000E
135
		L3H,      //L3H, but also L2000E
136
		L4R,      //L4500R
136
		L4R,      //L4500R
137
		L5x,      //L5800C 
137
		L5x,      //L5800C 
138
		L5D,      //L5000D/DF
138
		L8L,      //L8400L
139
		L8L,      //L8400L
139
		M1A,      //M1300A
140
		M1A,      //M1300A
140
		M2E,      //M2400E, L4400L
141
		M2E,      //M2400E, L4400L
Lines 309-314 static struct model_data model_conf[END_ Link Here
309
	},
310
	},
310
311
311
	{
312
	{
313
		.name              = "L5D",
314
		.mt_mled           = "MLED",
315
/* WLED present, but not controlled by ACPI */
316
/* TLED does not exist */
317
/* .mt_lcd_switch does not exist - handled by hardware */
318
/* .lcd_status  - unneccesary, see above */
319
		.brightness_set    = "SPLV",
320
		.brightness_get    = "GPLV",
321
		.display_set       = "SDSP",
322
		.display_get       = "\\INFB"
323
	},
324
325
	{
312
		.name              = "L8L"
326
		.name              = "L8L"
313
/* No features, but at least support the hotkeys */
327
/* No features, but at least support the hotkeys */
314
	},
328
	},
Lines 756-762 static int get_lcd_state(void) Link Here
756
{
770
{
757
	int lcd = 0;
771
	int lcd = 0;
758
772
759
	if (hotk->model != L3H) {
773
	if (hotk->model != L3H && hotk->model != L5D) {
760
	/* We don't have to check anything if we are here */
774
	/* We don't have to check anything if we are here */
761
		if (!read_acpi_int(NULL, hotk->methods->lcd_status, &lcd)) {
775
		if (!read_acpi_int(NULL, hotk->methods->lcd_status, &lcd)) {
762
#ifdef DEBUG
776
#ifdef DEBUG
Lines 804-810 static int set_lcd_state(int value) Link Here
804
	lcd = value ? 1 : 0;
818
	lcd = value ? 1 : 0;
805
	if (lcd != get_lcd_state()) {
819
	if (lcd != get_lcd_state()) {
806
		/* switch */
820
		/* switch */
807
		if (hotk->model != L3H) {
821
		if (hotk->model != L3H && hotk->model != L5D) {
808
			status =
822
			status =
809
			    acpi_evaluate_object(NULL, hotk->methods->mt_lcd_switch,
823
			    acpi_evaluate_object(NULL, hotk->methods->mt_lcd_switch,
810
						 NULL, NULL);
824
						 NULL, NULL);
Lines 1218-1223 static int __init asus_hotk_get_info(voi Link Here
1218
		hotk->model = A2x;
1232
		hotk->model = A2x;
1219
	else if (strncmp(model->string.pointer, "J1", 2) == 0)
1233
	else if (strncmp(model->string.pointer, "J1", 2) == 0)
1220
		hotk->model = S2x;
1234
		hotk->model = S2x;
1235
	else if (strncmp(model->string.pointer, "L5D", 3) == 0)
1236
		hotk->model = L5D;
1221
	else if (strncmp(model->string.pointer, "L5", 2) == 0)
1237
	else if (strncmp(model->string.pointer, "L5", 2) == 0)
1222
		hotk->model = L5x;
1238
		hotk->model = L5x;
1223
	else if (strncmp(model->string.pointer, "A4G", 3) == 0)
1239
	else if (strncmp(model->string.pointer, "A4G", 3) == 0)

Return to bug 119206