Attachment #639078 for bug #721972

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

Lines 18-26 Link Here

(-)suspend~/s2ram-x86.h (-2 / +2 lines)
18	/* Item size */	18	/* Item size */
19	#define ITEMSZ 1024	19	#define ITEMSZ 1024
20		20
21	char bios_version[ITEMSZ], sys_vendor[ITEMSZ], sys_product[ITEMSZ], sys_version[ITEMSZ];	21	extern char bios_version[ITEMSZ], sys_vendor[ITEMSZ], sys_product[ITEMSZ], sys_version[ITEMSZ];
22		22
23	int flags, force, fb_nosuspend, no_kms_flag;	23	extern int flags, force, fb_nosuspend, no_kms_flag;
24		24
25	#define HACKS_LONG_OPTS \	25	#define HACKS_LONG_OPTS \
26	{\	26	{\

Lines 38-43 static int vbe_mode = -1, dmi_scanned; Link Here

(-)suspend~/s2ram-x86.c (+4 lines)
38	#define S2RAM_NOFB 126	38	#define S2RAM_NOFB 126
39	#define S2RAM_UNKNOWN 127	39	#define S2RAM_UNKNOWN 127
40		40
		41	/* extern in s2ram-{{arch}}.h */
		42	char bios_version[ITEMSZ], sys_vendor[ITEMSZ], sys_product[ITEMSZ], sys_version[ITEMSZ];
		43	int flags, force, fb_nosuspend, no_kms_flag;
		44
41	void identify_machine(void)	45	void identify_machine(void)
42	{	46	{
43	if (!dmi_scanned) {	47	if (!dmi_scanned) {

Lines 549-555 static int decrypt_key(struct image_head Link Here

(-)suspend~/load.c (-1 / +1 lines)
549	memcpy(key, res, KEY_SIZE);	549	memcpy(key, res, KEY_SIZE);
550	memcpy(ivec, res + KEY_SIZE, CIPHER_BLOCK);	550	memcpy(ivec, res + KEY_SIZE, CIPHER_BLOCK);
551	} else {	551	} else {
552	fprintf(stderr,"The main key has invalid length %i, need %i\n", s, KEY_SIZE + CIPHER_BLOCK);	552	fprintf(stderr,"The main key has invalid length %zu, need %i\n", s, KEY_SIZE + CIPHER_BLOCK);
553	ret = -ENODATA;	553	ret = -ENODATA;
554	}	554	}
555	gcry_free(res);	555	gcry_free(res);

Lines 320-326 char __save_state(int psize) Link Here

(-)suspend~/vbetool/vbetool.c (-1 / +1 lines)
320		320
321	memset(&r, 0, sizeof(r));	321	memset(&r, 0, sizeof(r));
322		322
323	fprintf(stderr, "Allocated buffer at %p (base is 0x%x)\n", buffer,	323	fprintf(stderr, "Allocated buffer at %p (base is 0x%zx)\n", buffer,
324	LRMI_base_addr());	324	LRMI_base_addr());
325		325
326	r.eax = 0x4f04;	326	r.eax = 0x4f04;




	r.eax = 0x4f04;
	r.ecx = 0xf;		/* all states */
	r.edx = 2;		/* restore state */
	r.es  = (unsigned short) (((data - (char*) LRMI_base_addr()) >> 4) & 0xffff);
	r.ebx = (unsigned int)    ((data - (char*) LRMI_base_addr()) & 0xf);
	r.ds  = 0x0040;

	if (!LRMI_int(0x10, &r)) {
		fprintf(stderr,

	r.ecx = 0xf;		/* all states */
	r.edx = 1;		/* save state */
	
	r.es  = (unsigned short) (((buffer - (char*) LRMI_base_addr()) >> 4) & 0xffff);
	r.ebx = (unsigned int)    ((buffer - (char*) LRMI_base_addr()) & 0xf);
	r.ds  = 0x0040;

	fprintf(stderr, "ES: 0x%04X EBX: 0x%04X\n", r.es, r.ebx);


    .ebx = 0x0001
  };
  struct panel_id *id = LRMI_alloc_real(sizeof(struct panel_id));
  r.es  = (unsigned short) (((id - LRMI_base_addr()) >> 4) & 0xffff);
  r.edi = (unsigned long)   ((id - LRMI_base_addr()) & 0xf);

  if(sizeof(struct panel_id) != 32)
    return fprintf(stderr, "oops: panel_id, sizeof struct panel_id != 32, it's %ld...\n", sizeof(struct panel_id)), 7;

Return to bug 721972

Lines 243-251 void restore_state_from(char *data) Link Here

(-)suspend~/vbetool/vbetool.c (-8 / +8 lines)
243	r.eax = 0x4f04;	243	r.eax = 0x4f04;
244	r.ecx = 0xf; /* all states */	244	r.ecx = 0xf; /* all states */
245	r.edx = 2; /* restore state */	245	r.edx = 2; /* restore state */
246	r.es = (unsigned int) (data - LRMI_base_addr()) >> 4;	246	r.es = (unsigned short) (((data - (char*) LRMI_base_addr()) >> 4) & 0xffff);
247	r.ebx = (unsigned int) (data - LRMI_base_addr()) & 0xf;	247	r.ebx = (unsigned int) ((data - (char*) LRMI_base_addr()) & 0xf);
248	r.ds = 0x0040;	248	r.ds = 0x0040;
249		249
250	if (!LRMI_int(0x10, &r)) {	250	if (!LRMI_int(0x10, &r)) {
251	fprintf(stderr,	251	fprintf(stderr,
Lines 327-335 char __save_state(int psize) Link Here
327	r.ecx = 0xf; /* all states */	327	r.ecx = 0xf; /* all states */
328	r.edx = 1; /* save state */	328	r.edx = 1; /* save state */
329		329
330	r.es = (unsigned int) (buffer - LRMI_base_addr()) >> 4;	330	r.es = (unsigned short) (((buffer - (char*) LRMI_base_addr()) >> 4) & 0xffff);
331	r.ebx = (unsigned int) (buffer - LRMI_base_addr()) & 0xf;	331	r.ebx = (unsigned int) ((buffer - (char*) LRMI_base_addr()) & 0xf);
332	r.ds = 0x0040;	332	r.ds = 0x0040;
333		333
334	fprintf(stderr, "ES: 0x%04X EBX: 0x%04X\n", r.es, r.ebx);	334	fprintf(stderr, "ES: 0x%04X EBX: 0x%04X\n", r.es, r.ebx);
335		335
Lines 525-532 int do_get_panel_id(int just_dimensions) Link Here
525	.ebx = 0x0001	525	.ebx = 0x0001
526	};	526	};
527	struct panel_id *id = LRMI_alloc_real(sizeof(struct panel_id));	527	struct panel_id *id = LRMI_alloc_real(sizeof(struct panel_id));
528	r.es = (unsigned short)(((int)(id-LRMI_base_addr()) >> 4) & 0xffff);	528	r.es = (unsigned short) (((id - LRMI_base_addr()) >> 4) & 0xffff);
529	r.edi = (unsigned long)(id-LRMI_base_addr()) & 0xf;	529	r.edi = (unsigned long) ((id - LRMI_base_addr()) & 0xf);
530		530
531	if(sizeof(struct panel_id) != 32)	531	if(sizeof(struct panel_id) != 32)
532	return fprintf(stderr, "oops: panel_id, sizeof struct panel_id != 32, it's %ld...\n", sizeof(struct panel_id)), 7;	532	return fprintf(stderr, "oops: panel_id, sizeof struct panel_id != 32, it's %ld...\n", sizeof(struct panel_id)), 7;