Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efb2742e authored by Alex Dubov's avatar Alex Dubov Committed by Linus Torvalds
Browse files

memstick: add support for decoding "specfile" media attributes 



Signed-off-by: default avatarAlex Dubov <oakad@yahoo.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e4c70e85

drivers/memstick/core/mspro_block.c

+49 −0
Original line number Diff line number Diff line
@@ -109,6 +109,17 @@ struct mspro_mbr { 
	unsigned int  sectors_per_partition;

} __attribute__((packed));



struct mspro_specfile {

	char           name[8];

	char           ext[3];

	unsigned char  attr;

	unsigned char  reserved[10];

	unsigned short time;

	unsigned short date;

	unsigned short cluster;

	unsigned int   size;

} __attribute__((packed));



struct mspro_devinfo {

	unsigned short cylinders;

	unsigned short heads;
@@ -397,6 +408,41 @@ static ssize_t mspro_block_attr_show_mbr(struct device *dev, 
	return rc;

}



static ssize_t mspro_block_attr_show_specfile(struct device *dev,

					      struct device_attribute *attr,

					      char *buffer)

{

	struct mspro_sys_attr *x_attr = container_of(attr,

						     struct mspro_sys_attr,

						     dev_attr);

	struct mspro_specfile *x_spfile = x_attr->data;

	char name[9], ext[4];

	ssize_t rc = 0;



	memcpy(name, x_spfile->name, 8);

	name[8] = 0;

	memcpy(ext, x_spfile->ext, 3);

	ext[3] = 0;



	rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "name: %s\n", name);

	rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "ext: %s\n", ext);

	rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "attribute: %x\n",

			x_spfile->attr);

	rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "time: %d:%d:%d\n",

			x_spfile->time >> 11,

			(x_spfile->time >> 5) & 0x3f,

			(x_spfile->time & 0x1f) * 2);

	rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "date: %d-%d-%d\n",

			(x_spfile->date >> 9) + 1980,

			(x_spfile->date >> 5) & 0xf,

			x_spfile->date & 0x1f);

	rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "start cluster: %x\n",

			x_spfile->cluster);

	rc += scnprintf(buffer + rc, PAGE_SIZE - rc, "size: %x\n",

			x_spfile->size);

	return rc;

}



static ssize_t mspro_block_attr_show_devinfo(struct device *dev,

					     struct device_attribute *attr,

					     char *buffer)
@@ -429,6 +475,9 @@ static sysfs_show_t mspro_block_attr_show(unsigned char tag) 
		return mspro_block_attr_show_modelname;

	case MSPRO_BLOCK_ID_MBR:

		return mspro_block_attr_show_mbr;

	case MSPRO_BLOCK_ID_SPECFILEVALUES1:

	case MSPRO_BLOCK_ID_SPECFILEVALUES2:

		return mspro_block_attr_show_specfile;

	case MSPRO_BLOCK_ID_DEVINFO:

		return mspro_block_attr_show_devinfo;

	default: